3.0 - Add/fix tests.