tweak #2
simplify: move tests outside