Added more tests and update readme