For now, sample app should have no tests
Minor interface cleanup for existing tests