Added refactored tests