BS-1542, removed duplicate in unit tests and improve unit test coverage