More tests
Refactoring, removed old shim method