Minor code cleanup

Frantic coding has caused code cruft to accumulate.
Update tests to reflect code cleanup