fixed tests; but shipping dependency still has to be removed to get them working