Fixes to the Main entry test