consolidated the core tests and did some house cleaning