Added setters and getters
Added tests