Added testing harness and other fixes.

+ Added rudimentary test harness
+ Fixed visiblity.