Ceanup
Added several unit tests