Adds Unit Tests to UI messages and fixes Two syntax errors