Added the rest of my tests and a few more bug fixes