Improvide error messages
fix broken unit tests