Fix problems so now the test app runs