Add tests, remove skips for blocks