technical minor enhacement (tests, unused code)