Moved fluent tests to their own file and finished all the required modify stuff for #23