Fixes Hardware Ordering bug

At the time of creating this the tests currently fail. I'm unsure if the tests need to be fixed or the logic. I'm creating this pull request for more exposure.

Resolves #263