Fixed all the existing tests