Adding options to allow testing of configuration