Did some creating, renaming, and moving to be compatible with Rader's tests