Add more tests and accessors.