added const. and test file