Made Getters static and added some more tests