More tests; more features