Adjustments to tests to get correct apikey