Unshuffled 'getters for testing purposes' from the code. Also made better headers for aforementioned getters.