Revamped tests so the work serialized