added new methods and unittests, alphabetized classes per api