837994-redux progress check in 2

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
837994-redux, Updates to tests, removes irrelevant tests, disables out of date tests

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>