fixed/refactored some failing tests