Add testing to the app and fixed views