splitting plain and OCL tests for SURF