Removed unused lines
Added first tests