Fixes after testing, add test messages.