Improved check for unit attribute and removed xfail test, as suggested by Marten v. K.