Cleaned up parser, added more test cases