6 refactored tests