Fix app again; add additional test.