Configuration fix & Add functional tests