Add tests and support addressing correctly