Tested category methods, added several new ones