Fixed all failing tests :D