Add more tests

Includes more tests for the builder class
Add test file for Client