refactor tests, shrink to small block