added tests and solutions from class