test(app): Made test pass and fixed minor issues