Fixing tests
Fixed all errors