revamping tests