Implement trivial get_x methods, change method names in tests