Reviewed tests - needs more refactoring later