Added a few more tests and fixed up all of the errors.