Removing Richard's & fixed 14 tests ^_^, 14/76 to go