Fixes unit tests for namespace support following API changes