more objects, and adding tests