Refactored API Test app