derp
Merge branch 'test_akeeton_integration'

Merging akeeton's test PR