[Finished #42] Fixed failing tests.