removed legacy components, renamed some tests