Added test and changes