Commented stuff out so that test works