SSLR-287 Add more unit tests