Fix tests and remove test not relevant any more