Convert a few tests to new API and fix a some framework bugs