Cleaned test code