Updated checks for test/live keys