Unit tests and fluent support