Done with Tobias suggestion, still bugging at tests