Test cleanup
Various & sundry improvements