Sorted initial test, and added separate bundle test