added Case clause, though it's currently broken
renaming unit tests