More tests and verbose logging