Fix reset tests and do some other cleanup

Signed-off-by: Ken Barber <ken@bob.sh>