revert commit 1a086e59f4e6f564f2e4c9b0824925121554fe75

integrate tests back into their respective code files; this work isn't destined for
distribution so no need for the overhead of separating the code