Firebase testing

Merging the new Master changes into firebase_testing branch