Refactor these test. Need better grouping.