simplify test code + @gaye feedback