merging in some test stuff to my forked repo