bugs fixed in earlier tests
Merge remote groupmaster branch