Fixed all failing tests