Added acceptance test - need to fix