More tests and features