Finished the tests, I'm leaving the code in but commented out.