Remove lines and add tests