Made test branch stable. 

This is so that we can have a stable code source while debugging the master.