Increased Unit Testing & added first generation fluent api