More cleanup adding tests