Next step in new preprocessor for tests
Add error messages and fix bug