Testing issues (8/27)

Testing issues