Added default tests back in