Reinstated and fixed old tests