Bugfixes and get the custom customer locator working
Tidy up tests
Tidy up tests