Unit Test Bug Fixes

Full system test, stable release