add return status class and unit test