Added tests. Debugged accessors