Add tests and support for custom blueprints