Shorten var names and improve test msg