cleaning up tests
refactoring
skipping repeated var idents fixes #86