Fixed all existing tests