Tests and fixes
end of line fixes
Todos