Cleaned test code (again)