Fix group import, more tests