Working on test framework more