Removed coupling of tests