Remove unuseful LOC
Write more tests