Fixed some issues and changed testing to work for 2.6 and 2.7
Merge with master