Added tests. Added get and set