refactor tests and Site class, add new class User