Workaround to make tests work
tests runner
More tests