Revert "Merge pull request #275 from hassanNS/other_tests"

This reverts commit b68c507f9b928ce6e548bec74dbcd3476de133d0, reversing
changes made to ea35bab08bc2666d25aa09e5b17cb99627d03537.