refactor test bundle for sanity