Fixed error message
Fixed some issues with tests