* fixed issues with existing unit tests (all must pass now)