Refactored tests, use declarative syntax.