Add new tests and features