cleanup + addl tests