Split up where test into it's own file