removed old unused packages and updated test classes