Make the test app make more sense and less of a pain