Uncomment some getters.
Some tests.
Merge