Tests for Client & includePaths fix

Noticed there were no tests for the Client so I started writing them, also fixed a bug with includePaths not being set via the Client.

Still a work in progress.