Unit test tweaking (one test took too long, 250 seconds)