Fix redirect to blueprint
Add more unit tests