Getting rid of concept of 'paid' tests and attempting to fix infinite recursion bug