jlouis WIP: Improve code base tests

Latest commit 51a926a

Jan 22, 2017