Testing issues (9/27)

Testing issues