Switch to test-framework