add testing logic back in