Add more test coverage

Sonarqube indicates that there are 252 unit tests but only 43.8% code is covered. Our definition of done suggests test coverage should be at least 80%. 

See if there is any critical functionality that needs additional code coverage and add unit tests accordingly.