[966895] Added more unit tests