Change name of block getters and setters
Add tests for getting blocks