More testing
Fixing error messages