Fixed setters and getters and updated tests to have 100% coverage