Revert "Logic and tests updated"

This reverts commit 8581fed9c08b587a63a4e64e6f02ef2128a779cb.