[WIP] Add tests