Repairing tests

Still one failing but is due to a ddep problem with embedded groups