Avoid rerunning same test class multiply, improve tests