B-48400 Added unit tests