Adding tests for the new case statements that change functionality (bc5645f024b0c3c5495642226ab9daaf9d234906)