Cleaning up and adding missing tests