Updated test framework
Merge branch 'master' of https://github.com/kasper0406/IO13