Removed debug code
Added dependencies
Fixed tests