Lance

Merging additional tests into master