Added tests and getters/setters