Changes as per Luke's discussion
Include _ts for tests