Tests for getter, fixes for it in various cases