Finished writing tests, added accessors.