Fix up things to get first basic test running