Bug fixing and maintainance of this cute little test framework