updated discussion and tests