simplify testing
tidy tests