Fix failing unit test
Merge branch 'master' of github.com:bserdar/lightblue
Merge branch 'master' of github.com:bserdar/lightblue
Merge branch 'master' of github.com:bserdar/lightblue
Resolve Sonar issues