moving former sanity tests into system/hooks + iterating