Const added, unit tests are refactored