Updated tests to check that all are passing properly. Ready to present, but will try to add more tests.