Refactored tests to use declarative syntax and separated some tests.