Cleaning up new tests