Removed the feature testing from each executed method and made these methods proper to the given environment