add test and match spec and remove unused specs