Modified requirements.txt to work with a clean environment
When we recently changed from bmt to bmt lite, it broke moving the original type to the front of the list, probably because the default ordering is different. This fixes it
Adds a condition in one of the tests to make sure that the original type comes out in front.
Fixes #190