Manhole Tests

This branch is not yet ready for merging.