Move test assistants to separate file