refine core tests a little