More tests

/cc @adgad