Testing issues (12/27)

Testing issues