imporved tests, small refactor
removed unecessery files