Fixed unit tests after running on real device