Refactored tests into correct classes