working through unsub functions and tests