more tests and a first stab and reconfigure sanity
refactor reconfigure logic for reuse