Added more unit tests, cleaned up more of the jison file