Added smoke test
made other changes
Merge branch 'testing'