Re-enabled all tests - and also, trim spaces from the end of the values.