Wrote parser, added run script for testing, modified tests