Now the basic functionality is working. Uncommented test setup.