Working on revamping tests