Changed some names, strandardised unit testing for expressions (BinaryExpressionWrapper)
Unit tested all expression wrappers