Merging in some working tests...

Still a little ways to go.