working on bringing tests up to par with current functionality