fixing stuff
preparing to split unit tests logic