Added testing of g3, Nf3, O-O. Fixed two bugs found when testing.