Test data now successfully gets parsed by master
Reformatting, bug fixes, and cleanup