improve core test cases

See the single commit notes.
Sure, can you give this the same treatment as above? or does it not work?