made the testing neater