Refactored tests into separate suites