Added all of the tests and parsing stuff