Solved errors, and added 2 test