Added more tests.
Made message format as Enum.