Added tests, deleted tabs and unuseful spaces