Added more tests and features