update some tests.  need more work still
hack fix that probably will slow performance.  not sure of better way right now