Fixed all test errors