Removing test and switching to expressions.