Add some more tests

Test Plan:
- Run tests with ./tools/runtests