Removed topologies I'm doing nothing with... added tests