fixed up to current tests (still got rules issues)