Merge OK tests but not @Before/AfterClass tags