Adding backwards compatibility test

Fixed and refactored some utilities