fixing static code init issues, unit tests
new test files, other files