Fixed (I think) an issue with a bootstrap dependency.
Replaced default client test with a trivial, but working, test.
Moving code around.