Refactored functional tests - Removed unused functions and unnecessary comments