More tests, and full functionality besides some interface