Add turn + tests