remove old test files
few return update
spec upadted