Added missing constant for unit tests
Added missing semi-colons to maintain the coding standard