Fix static message, add tests