Decided I wanted to move these classes into the test package (concurrent was a bit too big)
Might as well let the wrappers still implement their original interfaces