fixing up tests and cleaning out deps