unit test scope expanded, cleanup