Unit test example and some cleanup