created some groups and fixed tests