Complete and simplify testing