Added more internal get_* methods and tests