better error messages
changed test variables and messages