Significant changes to Trial class
No more mocks, use fakes instead