Commit 4d753badc09cca1a85c4fb7f404bae2d6ed51f5f

Don 2018-03-21T11:33:38

Cleanup options around tests