prepare tests to refactor the API using blocks instead of classes.