Added Config
Added test cases