Started work on groups, added tests