refactored testing issues