Fixed app and tests