Revert "REmove problematic tests that test dead simple functionality"

This reverts commit 0f4477000c92bd84e35ac411818e9161dc8ce217.
Fix the tests