[PoC] Add more tests