Fixed tests to be able to build app