Put test code in its own namespace as a way to make autoexpect to work again.
Fixed failing tests.