Start on turning test into general method