Fixes to implement initial individual unit tests