Fixed all tests passing