Move circular tests to immutables