Add test framework and bundle support