Added tests and accessors