Fix for #7
Changed some test.done() scopes, so it's more logical