Cleaned up tests a bit, playing around with apikey settings