Remove scrapped/junk tests

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Updates per @gnarf37 review

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