changes to tests
include guard fixes
inital message implementation