Cleaned up Sodor-specific tests