Started adding more tests and classes; dictionary works