Final commit, tests formatted a bit cleaner. Project is now finished