cleaned up old tests, removed old parsing code, added new tests for #91