Added user files and changed tests to match the course files