remove everything except test #630