Added some tests, wrapped up the project
Added tests