cleanup - fixed tests