adeded more tests... changing scope?