Fixes
Fixed up issues + writing new tests for logging