fixed paths and some other shit
some tests