More tests, logging
Tests