Remove unused methods, make others protected
Split tests