TEST: more unit test dev