Revert "commented out unrelated tests temporarily"

This reverts commit 8c48c8b1dd7cc08add881828013acb36765362ae.