More error messages. More tests