Adding tests and attempting to remove overreaching nosetest coverage.