added tests and groups