Merge pull request #40 from ndvr/tyler

polish
finalized some basic tests