Work towards getting tests to pass

Related to #31, but #31 was accepted without passing because I needed the files in the master