Refactored tests into separate classes