Test setup sorted out, no more TODO