Updated tests with last changes - all tests pass.