solved one error
deleted test file
make group working :)
tests refactored and passing
Resolved merge conflicts