Rem unit test pending rewrite