Reinitialized
add show tests
fixed merge conflicts