Added Getters
Updated Data Tests
Update Data Test