Removing SQL from tests