Update include display messages, unit testing and test setup files