Updating old tests for better coverage results