Add more tests, fix bug with create_message