Having two separate files is ok (remember that we have had problem to debug with large .test files).