Tie up inconsistent maker IDs, fix best practices tests