Adjust fluent API to allow specifying query part in arbitrary order
Add class implementing the builder API without build() function
Remove API test method