Added more tests & more code