More tests & improvements
Added trailing spaces fix