still trying to get tests passing on emacss 23