Remove obsolete test
Remove debugging logging
Fix tests