Added test/live keys functionality