Fix tests and remove silly logging
Setup logging again
Straighten tests