Small additions to test app (still breaks when tests are added)