Added setters and getters
updated tests