remove unneaded tests
Add new tests and functionality