Singleton changes. bitfield tests fixes.