Introduction of groups and more tests.