More cleanup
Updated sample test project dependencies