Updated site, added more tests and finished refactoring simple classes