Revamping tests