mod - more tests / cleanup