Still had trouble with tests compiling, removed old test target and created a new one.
Added deletes and creation of threads to CardAndThreadProtocol. Added a Thread Type protocol.