adding refactored tests