#3 revamping tests