Fixes failing test
Remove debug info logging
Add more tests