Added test and changed test
Bug correction