Testing issues (7/27)

Testing issues