more tests and features