Added some extra test units to the test scene, and fixed some logging statements