fixing two tests, and adding missing test