Misc. Fixes and house keeping.  Started adding Unit Tests and removed Non-Int returning function calls.