Adds test cases and comments out failing test cases for now.