Renamed all the methods signatures to remove 'test'