More separation of test