slightly refactor Block/Block and its specs