Changes:
 - Test improvments
 - Some code cleanup/changes
 - Now raises RuntimeError if used with 3.4.0