first pass at getting functional tests to work