Fixing tests

updated tests