Cleanup: fix unit tests, simpler app test, remove print statements