added lines and more tests