Added Getters
Added More Tests for Data