Remove obsolete classes
Put tests in separate namespace