Test refactor8

Fixed assertEqual order in tests