Tests rewritten
changes...