normalize bundle, fix unit test