Fix invalid enum references in unit tests

[danielsaidi]

This commit makes the unit tests work again, by using the new enums.