functionality tests have been refactored