Made other CMR tests work