Fix test, break test and app