Add/fix tests.