fixed bad tests, added addtional checks