Updating tests to use anonymous classes so as not to interfere with other specs