Revert "Added some test Fixes"

This reverts commit fa2691e5cfe0cf3a492d2d3d7559c72a1f93e6db.