Written another test, fixed code