Fixed a lot of bugs in proteingrouping and its integration tests
Unittests follow new naming too