Adds some unit tests, improves visibility of class data, corrects typos