Migrate status class to a private class
Add unit test