Change testing structure to simplify adding tests