Cleaned a bit the test