BS-8611, add more unit tests