Removing variable exports, amending test cases as applicable