Remove unnecessary components of tests