Refactored and enhanced appearance of catchup-test.php