Added getters and setters to the model and modified the test cases