extra tests. removed some dead code.