Fix RHEL 5 unit test errors by removing dependencies on common models