added blocks to unit tests for fewer hack elsewhere