Changed the format so it is evaluated, and updated/added tests to reflect that